feat: support RN app migration #561

ben-kaufman · 2025-12-29T17:54:45Z

This PR adds support for migrating an existing React Native Bitkit into the Bitkit native app.
The migration passes:

Balances
Channels
Activities
Settings
Widgets
Tags and notes
Closed Channels

It also adds support for restoring a wallet created in RN app which was later deleted. Ie. create wallet in RN, use it, delete the app, install native, recover using mnemonic.

What's still needed:

New design for the loading screen and success toast of migration

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

Copilot

Pull request overview

This PR implements migration support for transitioning users from the React Native Bitkit app to the native Android version. The migration preserves critical wallet data including balances, channels, activities, settings, widgets, and tags/notes while maintaining a recovery path if issues occur.

Key changes:

Adds comprehensive RN data migration logic handling MMKV storage, keychain data, and LDK channel state
Implements migration loading UI with timeout protection and error handling
Coordinates migration flow across wallet initialization, node startup, and data synchronization phases

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 9 comments.

Show a summary per file

File	Description
gradle/libs.versions.toml	Updates ldk-node-android dependency to v0.7.0-rc.2
app/build.gradle.kts	Bumps version code from 17 to 160
MigrationService.kt	Core migration service handling RN data extraction, decryption, and native app data transformation
MmkvParser.kt	Binary parser for React Native MMKV storage format
MigrationLoadingScreen.kt	Loading screen UI displayed during migration process
WalletViewModel.kt	Orchestrates migration check and execution during wallet initialization
AppViewModel.kt	Handles migration completion, sync coordination, and timeout management
MainActivity.kt	Integrates migration loading screen into app navigation flow
LightningService.kt	Adds channel migration support to LDK node setup
LightningRepo.kt	Extends node start/setup to accept channel migration data and adds restart capability
CoreService.kt	Adds method to mark all unseen activities as seen during migration
ActivityRepo.kt	Exposes payment sync and bulk activity marking methods for migration

app/build.gradle.kts

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

app/src/main/java/to/bitkit/services/MigrationService.kt

app/src/main/java/to/bitkit/ui/screens/MigrationLoadingScreen.kt

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

app/src/main/java/to/bitkit/services/CoreService.kt

app/src/main/java/to/bitkit/services/MigrationService.kt

app/src/main/java/to/bitkit/services/RNBackupClient.kt

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

app/src/main/java/to/bitkit/services/MigrationService.kt

app/build.gradle.kts

jvsena42 · 2025-12-31T12:55:26Z

Failed restoring the channels on local migration, I'll try again, just in case

Native data

Build variant: mainDebug

versionCode = 162

        create("mainnet") {
            dimension = "network"
            applicationIdSuffix = ""
            buildConfigField("String", "NETWORK", "\"REGTEST\"")
            resValue("string", "app_name", "Bitkit")
            manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_orange"
            manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_orange_round"
        }

RN data
versionCode = 161
network = regtest

logs.txt

jvsena42 · 2025-12-31T13:27:50Z

Failed restoring the channels on local migration, I'll try again, just in case

Native data

Build variant: mainDebug

versionCode = 162

       create("mainnet") {
           dimension = "network"
           applicationIdSuffix = ""
           buildConfigField("String", "NETWORK", "\"REGTEST\"")
           resValue("string", "app_name", "Bitkit")
           manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_orange"
           manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_orange_round"
       }

RN data versionCode = 161 network = regtest

logs.txt

Second attempt, still failed. also noticed that the PIN was not imported

app/src/main/java/to/bitkit/services/MigrationService.kt

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

jvsena42 · 2025-12-31T18:12:37Z

Tested:

On RN

Create a fresh wallet
Open a channel
Send and receive lightning
Open a second channel
Enable PIN

On Android

Install the app with the RN installed
Migration triggered ✅
Channels restored ✅
Activities and balance restored ✅
Pin restored ✅
Disabled and re-enabled pin ✅

From the warnings, the PR needs a cleanup. After that I'll do a last review

piotr-iohk · 2026-01-01T13:57:52Z

In CI the @lightning_1 test fails. It passes for me locally. On CI however, I see that the failure is due to bg payments timesheet appearing after wallet restore from mnemonics (which is a step during the test). The BG payments timesheet appears despite the test hits "Allow" on the alert "Allow Bitkit Regtest to send you notification" (according to this conversation #556 (comment) the bg payments should not appear in such a case) cc: @jvsena42

Not sure, but maybe #565 will fix it?

lightning_-_Lightning_lightning_1_-_Can_receive_and_send_LN_payments-2026-01-01T13-14-46-568Z.mp4

jvsena42 · 2026-01-01T14:04:20Z

Not sure, but maybe #565 will fix it?

Probably. It has some improvements in this logic

jvsena42 · 2026-01-02T18:17:21Z

Can I review it already?

ben-kaufman · 2026-01-02T18:18:48Z

Yes should be ready

jvsena42 · 2026-01-05T13:03:06Z

@ben-kaufman the pull from master should fix the E2E errors

jvsena42 · 2026-01-06T10:32:29Z

@ben-kaufman can I test it again?

ben-kaufman · 2026-01-06T10:52:03Z

Yes 👍

jvsena42

Created RN wallet with passphrase
Opened channel and did LN operations
Deleted the app
Installed the native
Recover the app
LN data was not recovered ❌

I send the logs in DM

ben-kaufman · 2026-01-06T18:30:15Z

Recover of LN channels should be fixed now

ovitrif

✅ Approved with 2 nits, which I would like to defer to post-merge.

📋 Aside from these code-related remarks the other thing we discussed in DMs about migrating over the list of hidden todos from RN into the removedSuggestions list is the only comment I could add.

👏🏻 Everything else looks good to me, I like that most of the code is contained, given one day we will have to remove all of this, when we have enough indications that no more users need to migrate.

🧪 Tested by building the mainnet apk with the store release key and installing the APK over the PROD RN app which had a rather new wallet with most settings altered and 2 LN channels.

🟢 Everything migrated flawless and I was able to continue making and receiving payments to the 2 channels that persisted their open state.

Great work! 🥇

ovitrif · 2026-01-06T20:32:31Z

app/src/main/java/to/bitkit/services/MigrationService.kt

+                val selectedPairs = priceJson["selectedPairs"]?.jsonArray?.mapNotNull { pairElement ->
+                    val pairStr = pairElement.jsonPrimitive.content.replace("_", "/")
+                    when (pairStr) {
+                        "BTC/USD" -> to.bitkit.data.dto.price.TradingPair.BTC_USD


nit: I guess we could go through all to.bitkit.*.* entries in Android Studio and CMD + ENTER on macOS → "add import for…" but it's highly unlikely we will end up spending much time maintaining this code so I'm fine with the way it is now too.

ovitrif · 2026-01-06T21:35:47Z

app/src/main/java/to/bitkit/services/RNBackupClient.kt

+
+        return runCatching {
+            val keysManager = KeysManager.of(bip32Seed, seconds, nanoSeconds)
+            val method = keysManager.javaClass.getMethod("get_node_secret_key")


nit: investigating if there's a non-reflective alternative to handle this, meanwhile we can merge this PR.

found a way in fa59e07

Will push it in a separate small PR which will include the cleanup for the other comment

ben-kaufman requested review from jvsena42 and ovitrif December 29, 2025 17:54

github-advanced-security bot found potential problems Dec 29, 2025

View reviewed changes

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt Fixed Show fixed Hide fixed

jvsena42 requested a review from Copilot December 29, 2025 17:58

feat: support RN app migration

8c82b68

Copilot AI reviewed Dec 29, 2025

View reviewed changes

ben-kaufman force-pushed the feat/rn-migration branch from 781737a to 8c82b68 Compare December 29, 2025 18:00

Fix comments

db68175

ben-kaufman force-pushed the feat/rn-migration branch from b30f0d8 to db68175 Compare December 29, 2025 18:16

Add migration flags reset on wipe app

5594163

jvsena42 reviewed Dec 30, 2025

View reviewed changes

app/src/main/java/to/bitkit/repositories/LightningRepo.kt Outdated Show resolved Hide resolved

jvsena42 reviewed Dec 30, 2025

View reviewed changes

app/src/main/java/to/bitkit/services/CoreService.kt Show resolved Hide resolved

ben-kaufman added 2 commits December 30, 2025 22:04

feat: support restore from RN app

e4a2271

Merge branch 'master' into feat/rn-migration

29903db

github-advanced-security bot found potential problems Dec 31, 2025

View reviewed changes

jvsena42 reviewed Dec 31, 2025

View reviewed changes

app/src/main/java/to/bitkit/services/MigrationService.kt Outdated Show resolved Hide resolved

jvsena42 reviewed Dec 31, 2025

View reviewed changes

app/src/main/java/to/bitkit/services/MigrationService.kt Outdated Show resolved Hide resolved

jvsena42 reviewed Dec 31, 2025

View reviewed changes

app/src/main/java/to/bitkit/services/MigrationService.kt Show resolved Hide resolved

jvsena42 reviewed Dec 31, 2025

View reviewed changes

app/build.gradle.kts Outdated Show resolved Hide resolved

Fixes

971f29c

github-advanced-security bot found potential problems Dec 31, 2025

View reviewed changes

app/src/main/java/to/bitkit/services/MigrationService.kt Fixed Show fixed Hide fixed

app/src/main/java/to/bitkit/services/MigrationService.kt Fixed Show fixed Hide fixed

ben-kaufman added 2 commits December 31, 2025 10:20

Update MigrationService.kt

2fbe604

Fix channels sync on migration

bb8de2a

github-advanced-security bot found potential problems Dec 31, 2025

View reviewed changes

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt Fixed Show fixed Hide fixed

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt Fixed Show fixed Hide fixed

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt Fixed Show fixed Hide fixed

Fix sync and PIN issues

cf7f89e

piotr-iohk mentioned this pull request Jan 1, 2026

Feat/rn migration synonymdev/bitkit-e2e-tests#91

Merged

Fix boosted tx restore and migration from RN

085c69f

ben-kaufman and others added 3 commits January 5, 2026 08:41

Merge branch 'master' into feat/rn-migration

9ebdfae

Fix LN sync issue

9a93bee

Merge branch 'master' into feat/rn-migration

74d7e4b

jvsena42 requested changes Jan 6, 2026

View reviewed changes

ben-kaufman added 2 commits January 6, 2026 11:34

Fix restore LN channel

36c4dc9

Replace try catch

c8c6e84

Merge branch 'master' into feat/rn-migration

6b81ff3

ovitrif requested a review from jvsena42 January 6, 2026 20:12

ovitrif approved these changes Jan 6, 2026

View reviewed changes

ovitrif merged commit 306ee77 into master Jan 6, 2026
23 of 25 checks passed

ovitrif deleted the feat/rn-migration branch January 6, 2026 21:44

feat: support RN app migration #561

feat: support RN app migration #561

Uh oh!

Conversation

ben-kaufman commented Dec 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jvsena42 commented Dec 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jvsena42 commented Dec 31, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jvsena42 commented Dec 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

piotr-iohk commented Jan 1, 2026

Uh oh!

jvsena42 commented Jan 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jvsena42 commented Jan 2, 2026

Uh oh!

ben-kaufman commented Jan 2, 2026

Uh oh!

jvsena42 commented Jan 5, 2026

Uh oh!

jvsena42 commented Jan 6, 2026

Uh oh!

ben-kaufman commented Jan 6, 2026

Uh oh!

jvsena42 left a comment

Choose a reason for hiding this comment

Uh oh!

ben-kaufman commented Jan 6, 2026

Uh oh!

ovitrif left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ovitrif Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

ovitrif Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

ovitrif Jan 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ben-kaufman commented Dec 29, 2025 •

edited

Loading

jvsena42 commented Dec 31, 2025 •

edited

Loading

jvsena42 commented Dec 31, 2025 •

edited

Loading

jvsena42 commented Jan 1, 2026 •

edited

Loading

ovitrif left a comment •

edited

Loading

ovitrif Jan 6, 2026 •

edited

Loading